Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-68699] Upgrade Yarn from 1.22.19 to 3.2.0 #5824

Merged
merged 14 commits into from
Jul 21, 2022
Merged

[JENKINS-68699] Upgrade Yarn from 1.22.19 to 3.2.0 #5824

merged 14 commits into from
Jul 21, 2022

Conversation

StefanSpieker
Copy link
Contributor

@StefanSpieker StefanSpieker commented Oct 16, 2021 •
edited by gitpod-io bot
Loading

Upgrade to yarn 3.0 and minor node update. Accoring to this issue we still need to install the latest 1.x release to use the 3.0 ...

Proposed changelog entries

  • Internal: Upgrade to yarn 3.0

Proposed upgrade guidelines

N/A

Submitter checklist

  • (If applicable) Jira issue is well described
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change). Examples
    • Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
  • Appropriate autotests or explanation to why this change has no tests
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least 2 approvals for the pull request and no outstanding requests for change
  • Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
  • Changelog entries in the PR title and/or Proposed changelog entries are correct
  • Proper changelog labels are set so that the changelog can be generated automatically
  • If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

timja
timja reviewed Oct 16, 2021
View reviewed changes
@timja timja added skip-changelog Should not be shown in the changelog web-ui The PR includes WebUI changes which may need special expertise labels Oct 16, 2021
@timja timja requested a review from fqueiruga October 16, 2021 19:17
@StefanSpieker StefanSpieker changed the title Upgrade to yarn 3.0 and npm minor Upgrade to yarn 3.0 and minor node update Oct 16, 2021
timja
timja reviewed Oct 17, 2021
View reviewed changes
@StefanSpieker
Copy link
Contributor Author

I think we should wait for eirslett/frontend-maven-plugin#1012

@basil
Copy link
Member

basil commented Jan 2, 2022

I think we should wait for eirslett/frontend-maven-plugin#1012

@StefanSpieker eirslett/frontend-maven-plugin#1012 was released in 1.12.1, which we upgraded to in #6139.

@alecharp alecharp added the unresolved-merge-conflict There is a merge conflict with the target branch. label Mar 18, 2022
@NotMyFault
Copy link
Member

The outstanding blockers have been addressed by now, do you mind resolving the merge conflicts so we can pick the PR up for another review @StefanSpieker ?

@basil basil removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Apr 15, 2022
@basil
Copy link
Member

basil commented Apr 15, 2022

I resolved the hard/physical merge conflicts at least. There may still be soft/logical conflicts.

@basil
Copy link
Member

basil commented Apr 16, 2022

I just pushed some commits that should complete this effort.

basil
basil previously approved these changes Apr 16, 2022
View reviewed changes
@basil basil requested a review from a team April 16, 2022 15:04
@basil basil dismissed their stale review April 16, 2022 15:34

Didn't realize this was checking in a multi MB blob

@basil
Copy link
Member

basil commented Apr 16, 2022

Oh dear, war/.yarn/releases/yarn-3.2.0.cjs is a 2.1 MiB file? And they want you to check this into your repository? I really dislike this. Not sure we want to do this. There has to be a better way.

@basil basil reopened this Jul 20, 2022
@basil basil added squash-merge-me Unclean or useless commit history, should be merged only with squash-merge and removed proposed-for-close There is no consensus about feasibility of this PR, and maintainers do not see a way forward for it labels Jul 20, 2022
@basil
Copy link
Member

basil commented Jul 20, 2022

In commit b54f044 I found a trick to download Yarn Berry via Maven Antrun Plugin rather than Frontend Maven Plugin. If accepted, it is critical that this PR be squash merged to avoid bloating the repository size.

@basil basil changed the title Upgrade to yarn 3.0 and minor node update [JENKINS-68699] Upgrade Yarn from 1.22.19 to 3.2.0 Jul 20, 2022
@basil basil requested a review from a team July 20, 2022 19:00
@NotMyFault NotMyFault added dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code, used by dependency tooling labels Jul 20, 2022
@NotMyFault NotMyFault requested a review from timja July 20, 2022 19:49
timja
timja approved these changes Jul 20, 2022
View reviewed changes
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested it out locally and all seems good

NotMyFault
NotMyFault approved these changes Jul 20, 2022
View reviewed changes
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for investigating into an alternative solution, basil, works out great so far when checking out locally.

Non blocking nit: berry 3.2.1 is out by now which we could use over 3.2.0.

@timja timja added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jul 20, 2022
@basil
Copy link
Member

basil commented Jul 20, 2022

Non blocking nit

I am glad this is non-blocking, because I would decline to accommodate it after going above and beyond the expectations for a maintainer to the degree that I already have regarding this PR which I did not submit myself.

@basil
Copy link
Member

basil commented Jul 20, 2022

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process. Thanks!

@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Jul 21, 2022
@github-actions
Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Jul 21, 2022
@timja timja merged commit bcefcc5 into jenkinsci:master Jul 21, 2022
@daniel-beck
Copy link
Member

Renovate doesn't seem to like this in #6892.

@timja
Copy link
Member

timja commented Jul 21, 2022

Renovate doesn't seem to like this in #6892.

I'll take a look, renovate definitely supports it

@timja
Copy link
Member

timja commented Jul 21, 2022

looking at renovatebot/renovate#14797

@timja
Copy link
Member

timja commented Jul 21, 2022

see renovatebot/renovate#15414

@timja timja mentioned this pull request Jul 21, 2022
Merged
@basil
Copy link
Member

basil commented Jul 21, 2022

I pushed commit 33ba459 to #6894 to make the hack even more gross to be able to support Renovate.

@jglick jglick mentioned this pull request Jan 20, 2023
Merged
11 tasks
@Vlatombe
Copy link
Member

Not sure this matters, but the antrun execution breaks offline usage.

@basil
Copy link
Member

basil commented Apr 11, 2023

The antrun execution is a hack to work around eirslett/frontend-maven-plugin#1032. The long-term solution should be implemented in frontend-maven-plugin and would support offline usage.

@sbernard31 sbernard31 mentioned this pull request Nov 28, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@basil basil basil left review comments

@NotMyFault NotMyFault NotMyFault approved these changes

@timja timja timja approved these changes

@fqueiruga fqueiruga Awaiting requested review from fqueiruga

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code, used by dependency tooling ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback skip-changelog Should not be shown in the changelog squash-merge-me Unclean or useless commit history, should be merged only with squash-merge web-ui The PR includes WebUI changes which may need special expertise
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@StefanSpieker @basil @NotMyFault @timja @daniel-beck @Vlatombe @alecharp